livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed major sub-task EXT-5931 ( [XUI ATTRIBUTE NOT TRANSLATABLE] People > My Groups displays English string when no groups added) 

- implemented workaround: added <strings> name="no_filtered_groups_msg" & name="no_groups_msg" in panel_people.xml
- also updated value for no_filtered_groups_msg. It was "Try fine...", seems should be "Try finding..."

--HG--
branch : product-engine
master
Mike Antipov 2010-03-03 16:24:25 +02:00
parent 66128f6784
commit c01c2ec86f
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llgrouplist.h
View File

@ -74,6 +74,11 @@ public:
void setNameFilter(const std::string& filter);
void toggleIcons();
bool getIconsVisible() const { return mShowIcons; }
// *WORKAROUND: two methods to overload appropriate Params due to localization issue:
// no_groups_msg & no_filtered_groups_msg attributes are not defined as translatable in VLT. See EXT-5931
void setNoGroupsMsg(const std::string& msg) { mNoGroupsMsg = msg; }
void setNoFilteredGroupsMsg(const std::string& msg) { mNoFilteredGroupsMsg = msg; }
private:
void setDirty(bool val = true) { mDirty = val; }

2
indra/newview/llpanelpeople.cpp
View File

@ -519,6 +519,8 @@ BOOL LLPanelPeople::postBuild()
mRecentList->setShowIcons("RecentListShowIcons");
mGroupList = getChild<LLGroupList>("group_list");
mGroupList->setNoGroupsMsg(getString("no_groups_msg"));
mGroupList->setNoFilteredGroupsMsg(getString("no_filtered_groups_msg"));
mNearbyList->setContextMenu(&LLPanelPeopleMenus::gNearbyMenu);
mRecentList->setContextMenu(&LLPanelPeopleMenus::gNearbyMenu);

16
indra/newview/skins/default/xui/en/panel_people.xml
View File

@ -28,6 +28,16 @@
<string
name="groups_filter_label"
value="Filter Groups" />
<!--
*WORKAROUND: for group_list.no_groups_msg & group_list.no_filtered_groups_msg attributes.
They are not defined as translatable in VLT. See EXT-5931
-->
<string
name="no_filtered_groups_msg"
value="[secondlife:///app/search/groups Try finding the group in search?]" />
<string
name="no_groups_msg"
value="[secondlife:///app/search/groups Try searching for some groups to join.]" />
<filter_editor
text_pad_left="10"
follows="left|top|right"
@ -240,13 +250,17 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
name="groups_panel"
top="0"
width="313">
<!--
*NOTE: no_groups_msg & group_list attributes are not defined as translatable in VLT. See EXT-5931
Values are set from appropriate strings at the top of file via LLPeoplePanel::postBuild()
-->
<group_list
follows="all"
height="345"
layout="topleft"
left="0"
name="group_list"
no_filtered_groups_msg="[secondlife:///app/search/groups Try fine the group in search?]"
no_filtered_groups_msg="[secondlife:///app/search/groups Try finding the group in search?]"
no_groups_msg="[secondlife:///app/search/groups Try searching for some groups to join.]"
top="0"
width="313" />