diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2010-03-03 19:00:41 +0200 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2010-03-03 19:00:41 +0200 |
| commit | 194a8d45b5d8871458b5f0592050e288727c74bc (patch) | |
| tree | 4390b72b91077c7bddd6bf652e569784a8e4ae20 | |
| parent | 9a02fe0a2648428f2167cacc7b1c3abd06189c67 (diff) | |
Changed fix for normal bug EXT-5838 (Creating a new wearable in a localized viewer appends localized wearable name with English word "New")
to make string more flexible- now position of item name may be changed in xml.
- Now string for localizations is "NewWearable" in strings.xml.
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llwearablelist.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llwearablelist.cpp b/indra/newview/llwearablelist.cpp index 0a3a0fd60c..b2de31218b 100644 --- a/indra/newview/llwearablelist.cpp +++ b/indra/newview/llwearablelist.cpp @@ -235,8 +235,9 @@ LLWearable* LLWearableList::createNewWearable( EWearableType type ) LLWearable *wearable = generateNewWearable(); wearable->setType( type ); - std::string name = LLTrans::getString("New") + " "; - name.append( wearable->getTypeLabel() ); + LLSD item_name = LLSD().with("[WEARABLE_ITEM]", wearable->getTypeLabel()); + std::string name = LLTrans::getString("NewWearable"); + LLStringUtil::format(name, item_name); wearable->setName( name ); LLPermissions perm; diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 358cd62575..59c54f0cad 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1770,7 +1770,7 @@ Clears (deletes) the media and all params from the given face. <string name="invalid">invalid</string> <!-- Wearable List--> - <string name="New">New</string> + <string name="NewWearable">New [WEARABLE_ITEM]</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 --> |