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

FIRE-5998: Fix for unlocalizable labels on estate panel on region info floater

Ansariel 2012-09-20 14:55:35 +02:00
parent ed108b3897
commit 8f0ee9368a
4 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/llfloaterregioninfo.cpp
View File

@ -2870,9 +2870,15 @@ bool LLDispatchSetEstateAccess::operator()(
}
std::string msg = llformat("Banned residents: (%d, max %d)",
totalBannedAgents,
ESTATE_MAX_ACCESS_IDS);
// <FS:Ansariel> FIRE-5998: Unlocalizable label
//std::string msg = llformat("Banned residents: (%d, max %d)",
// totalBannedAgents,
// ESTATE_MAX_ACCESS_IDS);
LLStringUtil::format_map_t args;
args["[BANNEDAGENTS]"] = llformat("%d", totalBannedAgents);
args["[MAXBANNED]"] = llformat("%d", ESTATE_MAX_ACCESS_IDS);
std::string msg = LLTrans::getString("RegionInfoBannedResidents", args);
// </FS:Ansariel>
panel->getChild<LLUICtrl>("ban_resident_label")->setValue(LLSD(msg));
if (banned_agent_name_list)
@ -2891,9 +2897,15 @@ bool LLDispatchSetEstateAccess::operator()(
if (access_flags & ESTATE_ACCESS_MANAGERS)
{
std::string msg = llformat("Estate Managers: (%d, max %d)",
num_estate_managers,
ESTATE_MAX_MANAGERS);
// <FS:Ansariel> FIRE-5998: Unlocalizable label
//std::string msg = llformat("Estate Managers: (%d, max %d)",
// num_estate_managers,
// ESTATE_MAX_MANAGERS);
LLStringUtil::format_map_t args;
args["[ESTATEMANAGERS]"] = llformat("%d", num_estate_managers);
args["[MAXMANAGERS]"] = llformat("%d", ESTATE_MAX_MANAGERS);
std::string msg = LLTrans::getString("RegionInfoEstateManagers", args);
// </FS:Ansariel>
panel->getChild<LLUICtrl>("estate_manager_label")->setValue(LLSD(msg));
LLNameListCtrl* estate_manager_name_list =

2
indra/newview/skins/default/xui/de/panel_region_estate.xml
View File

@ -52,7 +52,7 @@
<check_box label="Verweigern - Zahlungsinfo verwendet" name="deny_transacted"/>
<button label="Übernehmen" name="apply_btn"/>
<text name="estate_manager_label">
Grundbesitzsverwalter:
Grundbesitzverwalter:
</text>
<text name="allow_resident_label">
Zulässige Einwohner:

8
indra/newview/skins/default/xui/de/strings.xml
View File

@ -1884,6 +1884,14 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="RegionInfoAllowedGroups">
Zulässige Gruppen: ([ALLOWEDGROUPS], max [MAXACCESS])
</string>
<!-- FS:Ansariel: Estate managers and banned residents strings -->
<string name="RegionInfoEstateManagers">
Grundbesitzverwalter: ([ESTATEMANAGERS], max [MAXMANAGERS])
</string>
<string name="RegionInfoBannedResidents">
Verbannte Einwohner: ([BANNEDAGENTS], max [MAXBANNED])
</string>
<!-- END FS:Ansariel: Estate managers and banned residents strings -->
<string name="ScriptLimitsParcelScriptMemory">
Parzellenskript-Speicher
</string>

8
indra/newview/skins/default/xui/en/strings.xml
View File

@ -2551,8 +2551,12 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
all estates that you manage for [OWNER]
</string>
<string name="RegionInfoAllowedResidents">Allowed Residents: ([ALLOWEDAGENTS], max [MAXACCESS])</string>
<string name="RegionInfoAllowedGroups">Allowed groups: ([ALLOWEDGROUPS], max [MAXACCESS])</string>
<string name="RegionInfoAllowedGroups">Allowed Groups: ([ALLOWEDGROUPS], max [MAXACCESS])</string>
<!-- FS:Ansariel: Estate managers and banned residents strings -->
<string name="RegionInfoEstateManagers">Estate Managers: ([ESTATEMANAGERS], max [MAXMANAGERS])</string>
<string name="RegionInfoBannedResidents">Banned Residents: ([BANNEDAGENTS], max [MAXBANNED])</string>
<!-- END FS:Ansariel: Estate managers and banned residents strings -->
<!-- script limits floater -->
<string name="ScriptLimitsParcelScriptMemory">Parcel Script Memory</string>
<string name="ScriptLimitsParcelsOwned">Parcels Listed: [PARCELS]</string>