From 63678f96adcf195da7f9cf77b592352c79e06c3a Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Wed, 3 Mar 2010 16:56:29 +0200 Subject: Fixed normal bug EXT-5838 (Creating a new wearable in a localized viewer appends localized wearable name with English word "New") - Moved hardcoded string to string "New" in strings.xml. --HG-- branch : product-engine --- indra/newview/llwearablelist.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llwearablelist.cpp') diff --git a/indra/newview/llwearablelist.cpp b/indra/newview/llwearablelist.cpp index d6a9837b86..0a3a0fd60c 100644 --- a/indra/newview/llwearablelist.cpp +++ b/indra/newview/llwearablelist.cpp @@ -235,7 +235,7 @@ LLWearable* LLWearableList::createNewWearable( EWearableType type ) LLWearable *wearable = generateNewWearable(); wearable->setType( type ); - std::string name = "New "; + std::string name = LLTrans::getString("New") + " "; name.append( wearable->getTypeLabel() ); wearable->setName( name ); -- cgit v1.2.3 From 194a8d45b5d8871458b5f0592050e288727c74bc Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Wed, 3 Mar 2010 19:00:41 +0200 Subject: 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 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview/llwearablelist.cpp') 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; -- cgit v1.2.3