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

EXT-8170 ADDITIONAL FIX Now using complete translatable sentences like "Create new shoes", "Create new pants", etc as labels for AE context menus. 

Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/716/

--HG--
branch : product-engine
meow-7.2.2
Vadim Savchuk 2010-07-08 19:21:00 +03:00
parent 900a9d29fb
commit 417b98eae1
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llcofwearables.cpp
View File

@ -79,9 +79,7 @@ protected:
}
// Set proper label for the "Create new <WEARABLE_TYPE>" menu item.
LLStringUtil::format_map_t args;
args["[WEARABLE_TYPE]"] = LLTrans::getString(LLWearableType::getTypeDefaultNewName(w_type));
std::string new_label = LLTrans::getString("CreateNewWearable", args);
std::string new_label = LLTrans::getString("create_new_" + LLWearableType::getTypeName(w_type));
menu_item->setLabel(new_label);
}

4
indra/newview/llwearableitemslist.cpp
View File

@ -725,10 +725,8 @@ void LLWearableItemsList::ContextMenu::updateItemsLabels(LLContextMenu* menu)
LLViewerInventoryItem* item = gInventory.getLinkedItem(mUUIDs.back());
if (!item || !item->isWearableType()) return;
LLStringUtil::format_map_t args;
LLWearableType::EType w_type = item->getWearableType();
args["[WEARABLE_TYPE]"] = LLWearableType::getTypeDefaultNewName(w_type);
std::string new_label = LLTrans::getString("CreateNewWearable", args);
std::string new_label = LLTrans::getString("create_new_" + LLWearableType::getTypeName(w_type));
LLMenuItemGL* menu_item = menu->getChild<LLMenuItemGL>("create_new");
menu_item->setLabel(new_label);

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

@ -1830,9 +1830,26 @@ Clears (deletes) the media and all params from the given face.
<string name="tattoo_not_worn">Tattoo not worn</string>
<string name="invalid_not_worn">invalid</string>
<!-- Create new wearable of the specified type -->
<string name="create_new_shape">Create new shape</string>
<string name="create_new_skin">Create new skin</string>
<string name="create_new_hair">Create new hair</string>
<string name="create_new_eyes">Create new eyes</string>
<string name="create_new_shirt">Create new shirt</string>
<string name="create_new_pants">Create new pants</string>
<string name="create_new_shoes">Create new shoes</string>
<string name="create_new_socks">Create new socks</string>
<string name="create_new_jacket">Create new jacket</string>
<string name="create_new_gloves">Create new gloves</string>
<string name="create_new_undershirt">Create new undershirt</string>
<string name="create_new_underpants">Create new underpants</string>
<string name="create_new_skirt">Create new skirt</string>
<string name="create_new_alpha">Create new alpha</string>
<string name="create_new_tattoo">Create new tattoo</string>
<string name="create_new_invalid">invalid</string>
<!-- Wearable List-->
<string name="NewWearable">New [WEARABLE_ITEM]</string>
<string name="CreateNewWearable">Create [WEARABLE_TYPE]</string>
<!-- LLGroupNotify -->
<!-- used in the construction of a Group Notice blue dialog box, buttons, tooltip etc. Seems to be no longer utilized by code in Viewer 2.0 -->