From 194a8d45b5d8871458b5f0592050e288727c74bc Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Wed, 3 Mar 2010 19:00:41 +0200
Subject: [PATCH] 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
---
indra/newview/llwearablelist.cpp | 5 +++--
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 0a3a0fd60cc..b2de31218be 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 358cd625756..59c54f0cadc 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 -->
--
GitLab